Feature initialization added - UNTESTED