Fixed poms and addes some features