added mvn fw support. refactoring