Add new create functionality (previous was old and broken)