Added shot and station factories