FELIX-1010 : Several fixes for the annotations stuff; removed obsolete methods from interface and fixed property handling.