Added build step/event system