Added before/after create listener