Refactored Goal model and implemented goal specification