Add non enhanced beans and other useless methods
Updated code
Added code