Fix visibility of properties
Fix annotations