Added some annotations (@Suppress Warnings etc)