further changes in order to improve interaction between components in entry creation