JMX added + refactor + aspects