Changed Creates to fit better data structure