Core functionallity added