Removing REST dependency in the core framework