Fixed Cases + added few constants
Added struct