Fixed storing of direction, moved direction over to metadata