Updated feature & build step