Fixed pickadate and refactored event model