Added creator logic