Finished parsing attributes in signature
Moved code to proper places