Added Core Functionality