Code refactoring and web support added