Do not user Session and fix Bugs