Updated BIO handling to be more clear