Refactoring Bl-Commands and add throw's