Removed composite pattern, added more features to change study init