Added first scope handling and parsing