API first features
Resolving merge issue