added dist management
revert to hsql