Removed init wrapper