Core functionality added