Refactored some kinds and reset to placeholder selectors