Added core functionality