Made updates to utilities as per MIl-225 and completed all sorts of refactoring