Added index return on create and throw exception on front